From ff79447eedc5458486a89f941b3ccea786b97b6e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 3 Mar 2022 17:24:16 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 526248 -> 526967 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c68c46ed67b..009c3bdff2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -860,7 +860,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 2f0f61b7b138f6d272bdf04dccb08228b4ebd85d..e2828da26fe815e2475c7e8dce302ff3f24f960c 100644
GIT binary patch
delta 551
zcmZ3{ukd|}Lc<ou-zmIY3P2E@l~|UTlAk<zLy4FKSOhGpt6QE~lA#Ngoc=$VQHmYL
zQAlA_XYm4Ro9>gssLTl!R!Es#_fd?)-^E)2CMP+4LkgqjbioOXiqmz&7=_>_+)QRv
zlLuQCtD^&P2FSX2s8P0+sl~DFZ&Db6m<foPx4%hYIVL5TnwOZAlNz6&lC7kmXseKy
zKV2}BMQgg<IaZG8_v%@^#5pt56iQNyOB9q;kj<OCP*7&NK?95N^qHNkeA9CqSk$KP
zddR{%eNF?5>f``Xmgxr@SmdWyZDy329)E>}Yx;vU7MAHujVxl*f8S=~pDZB7GyQ-h
zGwXEYMi%ku7bY-?O^;|~F`Qme&Z0Q|y$y>x$c)MR#W<$x*8xqv)W~8m{lPXyj_FKI
zKn2pt%;M7nBA8jG>ooy2J$ua}G5MY_$MpOr7Tf9lB`h4%*EF$6s(^wW1ky6OI2BTJ
zic`5bITcFtic?Dzyd1+EUHqN7IHwCHv5E+w3Z`XFzthAbC64eqRJmucyO)dq^o7+-
k5_0HTxE!71gF~HyLo`5&+dnq305K~Nvu*#_#J;@+0Ih<yasU7T

delta 240
zcmex9MPWt1Lc<ou-zn{L(inl535c1u&q-t1E;YTUmPKWHUn5J<^q4vp-suueEPB&t
z*Re=UPig`Z(wQtm(<d~s$V}hR#3Dca*CZy9>3Y{$xTb$?Vv(AjUBe_k{lZOFmg)M<
zEaKA>xS08-$27ATPG6qRDmZzAH1FhiKcQ*iK=}<b7&)e2s0Ui`u9?MPx>^g1;`I1D
z7XImJEiAgzpB-iwn7+A%#a7tMG0f4$-`O+R-3v(BDpjTyPY+CG6`j7Pm4#Ep(K$Xi
b)G0Vb14&u?fmRkEW(8ul?FU-fx3>TQQZ`lA

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 6477ad71e8c..c23343a027e 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 0ffc004d871..8062fce1e48 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2